ff2554
@@ -545,6 +545,7 @@
private ReparseResult parseRewrittenQuery(StringBuilder rewrittenQueryStr, Strin
     Context rewrittenCtx;
     try {
       rewrittenCtx = new Context(conf);
+      rewrittenCtx.setHDFSCleanup(true);
       // We keep track of all the contexts that are created by this query
       // so we can clear them when we finish execution
       ctx.addRewrittenStatementContext(rewrittenCtx);
